Initialize unthemed_icon to NULL to avoid accessing uninitialized memory

	* gtk/gtkicontheme.c (choose_icon): Initialize unthemed_icon to NULL
	to avoid accessing uninitialized memory when
	gtk_icon_theme_choose_icon() is called with an empty names list.

svn path=/trunk/; revision=18018

diff --git a/ChangeLog b/ChangeLog
index 336ac500b9657e6ecd202abd1c67b7372cc0d5e4..8a522f75c6de8dd3c1d22c67d3680ed795e8745a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-03  Torsten Schoenfeld  <kaffeetisch@gmx.de>
+
+       * gtk/gtkicontheme.c (choose_icon): Initialize unthemed_icon to NULL
+       to avoid accessing uninitialized memory when
+       gtk_icon_theme_choose_icon() is called with an empty names list.
+
 2007-06-03  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkevents-quartz.c: (create_crossing_event): Set the key

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index d6accc94fe736396b50e0e69d643c12168400144..d00e21916afea817cf15a1fb03d5c06d9eaa88db 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1234,7 +1234,7 @@ choose_icon (GtkIconTheme       *icon_theme,
   GtkIconThemePrivate *priv;
   GList *l;
   GtkIconInfo *icon_info = NULL;
-  UnthemedIcon *unthemed_icon;
+  UnthemedIcon *unthemed_icon = NULL;
   gboolean allow_svg;
   gboolean use_builtin;
   gint i;